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