Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 26 10:25:39 PDT 2014