Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 12:53:40 PDT 2014