Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 03:33:57 PDT 2014