Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 26 13:23:44 PDT 2014