Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 09:13:39 PDT 2014