[popcornmix]

Note:
I did not rebase this build on 14.0-ALPHA or 13.0-BETA (so still 13.0-ALPHA) but it is pretty much the same (+ NC3).
I wonder where to go from here when it comes to test builds… concentrate on Gotham Beta (+ backports and additional commits) or continue with master…?

I would suggest sticking with master (14.0-ALPHA).
Until Gotham goes final, master is still in feature freeze, so the two trees will probably be identical.

Once Gotham goes final, then that tree will be used for official builds(*).

So test builds will be more useful from master at that point.

(*) There will likely be a gotham_rbp_backports branch with some useful patches from newclock3 that didn't make it into gotham that I imagine official raspmbc and openelec will use.
However this will be a relatively stable tree, with commits cherry-picked perhaps once a month if they have been proved stable on testing branch.

However experimental features, and improvements that rely on other commits from master will be master only (using newclock3 branch).