Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 13 01:45:05 PDT 2014