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