Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 20 15:14:37 PDT 2014