Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 23:48:44 PDT 2014