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